Sync'd branch integration/fx-team with upstream @ Wed Oct  1 09:58:39 PDT 2014