Commits

Tim Jenssen committed 56c5ce2b38bM
Merge remote-tracking branch 'origin/1.3' into 1.4 Change-Id: Ic8e6c13d020dbff3e1fb1ef156742aef81ba1b25
Merge remote-tracking branch 'origin/1.3' into 1.4 Change-Id: Ic8e6c13d020dbff3e1fb1ef156742aef81ba1b25