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