Sync'd branch integration/fx-team with upstream @ Wed Sep  3 07:05:32 PDT 2014