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