Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 23 Dec 2013 14:37:30 +0000 (15:37 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 23 Dec 2013 14:37:31 +0000 (15:37 +0100)
Change-Id: I0429a7186bef08918b777d6aa662685c57bad091


Trivial merge