Sync'd branch integration/fx-team with upstream @ Mon Oct 20 14:00:25 PDT 2014