Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 27 Aug 2013 20:44:53 +0000 (22:44 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 27 Aug 2013 20:44:53 +0000 (22:44 +0200)
Change-Id: I469f258c4838f87edaedc8620d925a3c537d1619


Trivial merge