Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 30 Sep 2013 21:10:39 +0000 (23:10 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 30 Sep 2013 21:10:39 +0000 (23:10 +0200)
Change-Id: I298ab5a4c577868702edb5f7a6b2cd359d315699


Trivial merge