Merge master@5406228 into qt-dev.

Change-Id: Ia7071251375b446d87617a09c0cc201e3bf06486
BUG: 129345239