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