Sync'd branch integration/fx-team with upstream @ Mon Oct 27 11:48:49 PDT 2014