Commits

Tim Jenssen committed 1b4cd05fda3M
Merge remote-tracking branch 'origin/1.3' into 1.4 Change-Id: I23f5afd437faab491ddc2ed6ee561054f24f6ce8
Merge remote-tracking branch 'origin/1.3' into 1.4 Change-Id: I23f5afd437faab491ddc2ed6ee561054f24f6ce8