Sync'd branch integration/fx-team with upstream @ Wed Sep  3 09:33:34 PDT 2014