Merge master@5406228 into qt-dev.
am: 8bd33112e3

Change-Id: I8bde40dc469c51fc88bae3fac491c18238f38ead