Sync'd branch integration/fx-team with upstream @ Mon Oct 27 08:14:45 PDT 2014