Merge master@5406228 into qt-dev.
am: e516d1dc0e

Change-Id: I1e8097b1cfe07100e9284002b431df903dace3a6