Merge master@5406228 into qt-dev. am: 4ebe617956
am: 4c85b4e681

Change-Id: I8e4667ce315fce75f519313d922b19d37f7256dd