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