Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 5 Dec 2013 17:46:27 +0000 (18:46 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 5 Dec 2013 17:46:27 +0000 (18:46 +0100)
Change-Id: Idd4115a252a1bde50b6f47ec9eba8710dec0d5fb


Trivial merge