Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
authorSimon Hausmann <simon.hausmann@theqtcompany.com>
Tue, 28 Apr 2015 12:27:02 +0000 (12:27 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 28 Apr 2015 12:27:02 +0000 (12:27 +0000)

Trivial merge