Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 27 Jan 2014 17:54:20 +0000 (18:54 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 27 Jan 2014 17:54:20 +0000 (18:54 +0100)
Change-Id: I83d589c55e8463cce23068dc81096aa66ec596a5


Trivial merge