Sync'd branch integration/fx-team with upstream @ Mon Oct 27 18:00:43 PDT 2014