Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
authorSimon Hausmann <simon.hausmann@digia.com>
Thu, 11 Sep 2014 07:53:39 +0000 (09:53 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 11 Sep 2014 09:41:47 +0000 (11:41 +0200)

Trivial merge