Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Thu, 23 Jul 2015 16:59:48 +0000 (16:59 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 23 Jul 2015 16:59:48 +0000 (16:59 +0000)

Trivial merge