Merge remote-tracking branch 'origin/release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:52:43 +0000 (21:52 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:52:43 +0000 (21:52 +0200)
Change-Id: I4ad3ca66f63476974bdfcadcff373179715a34d2


Trivial merge