Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
authorSimon Hausmann <simon.hausmann@digia.com>
Tue, 14 Oct 2014 16:29:13 +0000 (18:29 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 14 Oct 2014 16:29:13 +0000 (18:29 +0200)

Trivial merge