Sync'd branch integration/fx-team with upstream @ Mon Oct  6 00:07:41 PDT 2014