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