Sync'd branch integration/fx-team with upstream @ Mon Oct 27 10:56:44 PDT 2014