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