Merge master@5406228 into qt-dev.

Change-Id: I8b7696d69917c0d5d1d20060b41785d0d6c2afc6
BUG: 129345239