Sync'd branch integration/fx-team with upstream @ Wed Sep  3 02:12:26 PDT 2014