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