Sync'd branch integration/fx-team with upstream @ Wed Aug 27 12:08:33 PDT 2014