Sync'd branch integration/fx-team with upstream @ Mon Oct 27 15:47:46 PDT 2014