Sync'd branch integration/fx-team with upstream @ Mon Oct 27 10:07:50 PDT 2014