merge fix
fix merge confilict with 276
Merge remote branch 'origin/branch-0.23-gd' into fb-YAHOO-218-branch-0.23-gd