Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
authorSimon Hausmann <simon.hausmann@theqtcompany.com>
Fri, 28 Aug 2015 04:57:18 +0000 (04:57 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 28 Aug 2015 04:57:18 +0000 (04:57 +0000)

Trivial merge