Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sahumada@blackberry.com>
Thu, 13 Mar 2014 18:33:48 +0000 (19:33 +0100)
committerSergio Ahumada <sahumada@blackberry.com>
Thu, 13 Mar 2014 18:34:34 +0000 (19:34 +0100)
Change-Id: Ic7e33502f9983cf67393afe11e2b194e0f922d18


Trivial merge