Merge master@5406228 into qt-dev.

Change-Id: I02fa35a961479af2a5abc7c9c4d46b5b538c09d6
BUG: 129345239