Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 26 Nov 2013 09:54:38 +0000 (10:54 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 26 Nov 2013 09:54:38 +0000 (10:54 +0100)
Change-Id: Ief9594bded2d96bdd3fc6b0e033df4511181bf7c


Trivial merge