Commits

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