Sync'd branch integration/fx-team with upstream @ Wed Oct 22 15:10:10 PDT 2014