Commits

Tim Jenssen committed d1334fb478cM
Merge remote-tracking branch 'origin/1.3' into 1.4 Change-Id: Ie74dcebe9412da0caceec9f541eb51ad46bfea9f
Merge remote-tracking branch 'origin/1.3' into 1.4 Change-Id: Ie74dcebe9412da0caceec9f541eb51ad46bfea9f