Merge remote-tracking branch 'origin/5.4.1' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 10 Feb 2015 09:34:52 +0000 (10:34 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 10 Feb 2015 09:34:52 +0000 (10:34 +0100)
Change-Id: I4167d268505cbc0b7b57888928670ae05302f4cb


Trivial merge