Merge remote branch 'origin/0.94' into 0.94-gd
Merge remote branch 'origin/0.94-gd' into fb-YAHOO-323-0.94-gd