Sync'd branch integration/fx-team with upstream @ Mon Oct 20 12:33:46 PDT 2014