Merge remote-tracking branch 'origin/release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 9 Aug 2013 20:37:42 +0000 (22:37 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 9 Aug 2013 20:37:42 +0000 (22:37 +0200)
Change-Id: I3bcc89d3e503b933e4bd4df241c8169e73fb9bd5


Trivial merge