Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
authorSimon Hausmann <simon.hausmann@digia.com>
Tue, 12 Aug 2014 10:34:35 +0000 (12:34 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 12 Aug 2014 12:43:59 +0000 (14:43 +0200)

Trivial merge