Merge remote-tracking branch 'origin/5.4.0' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 21 Nov 2014 12:45:17 +0000 (13:45 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 21 Nov 2014 12:45:17 +0000 (13:45 +0100)
Change-Id: Iec2c793710c95919975aa3c03144d915ca5fa84f


Trivial merge