Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 29 Jul 2014 11:01:05 +0000 (13:01 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 29 Jul 2014 11:24:46 +0000 (13:24 +0200)

Trivial merge