Commits

Tim Jenssen committed 7778787b91aM
Merge remote-tracking branch 'origin/1.4' into 1.5 Change-Id: Ib2d382d1aa398b642dc15f4df7c03b19bf638546
Merge remote-tracking branch 'origin/1.4' into 1.5 Change-Id: Ib2d382d1aa398b642dc15f4df7c03b19bf638546