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

Trivial merge