Commits

Tim Jenssen committed e14d0b31bc8M
Merge remote-tracking branch 'origin/1.4' into 1.5 Change-Id: I2725f9bacbe04240dc3f97062c5ebc50884822c8
Merge remote-tracking branch 'origin/1.4' into 1.5 Change-Id: I2725f9bacbe04240dc3f97062c5ebc50884822c8