Sync'd branch integration/fx-team with upstream @ Mon Oct 20 17:23:40 PDT 2014