Commits

Tim Jenssen committed 5995cfad283M
Merge remote-tracking branch 'origin/1.5' into 1.6 Change-Id: I818c7e398e99c1c28d6b44bfe41223c356afbb80
Merge remote-tracking branch 'origin/1.5' into 1.6 Change-Id: I818c7e398e99c1c28d6b44bfe41223c356afbb80