Merge remote-tracking branch 'origin/release' into stable
authorJani Heikkinen <jani.heikkinen@digia.com>
Wed, 23 Apr 2014 09:46:44 +0000 (12:46 +0300)
committerJani Heikkinen <jani.heikkinen@digia.com>
Wed, 23 Apr 2014 09:46:44 +0000 (12:46 +0300)
Change-Id: If733be66da6ef6b1e28ec6ba180beafea6c9990d


Trivial merge