Reconcile with jb-mr1-release - do not merge
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:19:44 +0000 (12:19 -0700)]

Trivial merge