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