Merge remote-tracking branch 'origin/stable' into 5.3
authorSergio Ahumada <sahumada@blackberry.com>
Sat, 14 Jun 2014 16:19:53 +0000 (18:19 +0200)
committerSergio Ahumada <sahumada@blackberry.com>
Sat, 14 Jun 2014 16:19:53 +0000 (18:19 +0200)
Change-Id: Id783915b0139a90ecfb99f8298b1ff5cf506a1dd


Trivial merge