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