Merge remote-tracking branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Thu, 27 Nov 2014 17:29:07 +0000 (18:29 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Thu, 27 Nov 2014 17:29:07 +0000 (18:29 +0100)
Change-Id: If3345bc6090bac3cddf98c6eed68f47686a3ee75


Trivial merge