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