Sync'd branch integration/fx-team with upstream @ Mon Oct 20 08:05:50 PDT 2014