Merge remote-tracking branch 'origin/release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 16 Aug 2013 18:53:47 +0000 (20:53 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 16 Aug 2013 18:53:47 +0000 (20:53 +0200)
Change-Id: Ibcde5cfcb97948f9e3f71a2d6b06397e1003aa3b


Trivial merge