Sync'd branch integration/fx-team with upstream @ Wed Oct  1 04:15:45 PDT 2014