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