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