last change
Merge remote branch 'origin/branch-0.11-gd' into fb-YAHOO-330-branch-0.11-gd