Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 22 Jan 2014 10:37:35 +0000 (11:37 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 22 Jan 2014 10:37:35 +0000 (11:37 +0100)
Change-Id: I93127fc2b9963d0fec1ca7180cfa2c110bf3d27d


Trivial merge