Sync'd branch integration/fx-team with upstream @ Mon Oct 20 08:29:49 PDT 2014