Merge remote-tracking branch 'origin/stable' into 5.3
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 30 Jul 2014 13:45:52 +0000 (15:45 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 30 Jul 2014 13:55:13 +0000 (15:55 +0200)
Change-Id: I8c3a43456ee3e378adbbda0d528d06201fd87256


Trivial merge