Merge remote-tracking branch 'origin/5.3.2' into 5.3
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 17 Sep 2014 18:58:33 +0000 (20:58 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 17 Sep 2014 18:58:33 +0000 (20:58 +0200)
Change-Id: I75765dd8b4ebe39933da89933df1d61ae209e0cd


Trivial merge