Sync'd branch integration/fx-team with upstream @ Wed Oct  1 11:46:46 PDT 2014