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