Merge remote branch 'origin/trunk-gd' into fb-YAHOO-313-trunk-gd