Sync'd branch integration/fx-team with upstream @ Mon Oct 27 04:38:15 PDT 2014