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