Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 6 Mar 2015 12:54:39 +0000 (12:54 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 6 Mar 2015 12:54:39 +0000 (12:54 +0000)

Trivial merge