Merge remote-tracking branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 21 Nov 2014 15:12:44 +0000 (16:12 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 21 Nov 2014 15:12:44 +0000 (16:12 +0100)
Change-Id: Id87e56ccfc9f33f98c3d06991f6fe9c14d38fbac


Trivial merge