Merge master@5406228 into qt-dev.
am: 33c12e7bd0

Change-Id: I1454256e05e19d3f9ff354436fa4dd0d1ae6c50d