Sync'd branch integration/fx-team with upstream @ Mon Oct 27 07:17:39 PDT 2014