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