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