Sync'd branch integration/fx-team with upstream @ Mon Oct  6 14:01:48 PDT 2014