Sync'd branch integration/fx-team with upstream @ Fri Aug 29 14:33:37 PDT 2014