Sync'd branch integration/fx-team with upstream @ Wed Aug 27 15:35:35 PDT 2014