Sync'd branch integration/fx-team with upstream @ Mon Oct 20 15:31:42 PDT 2014