Merge 5.4 into 5.4.1 v5.4.1
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Fri, 16 Jan 2015 17:05:00 +0000 (18:05 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Fri, 16 Jan 2015 17:05:00 +0000 (18:05 +0100)
Change-Id: Id1f12a225d975ba3a2c244e90c00126b9e90368a


Trivial merge