Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 12 Dec 2013 17:03:14 +0000 (18:03 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 12 Dec 2013 17:03:14 +0000 (18:03 +0100)
Change-Id: Ife41f7baf8113951233186f106cdc9c1b2e2bc55


Trivial merge