Sync'd branch integration/fx-team with upstream @ Mon Oct  6 06:30:42 PDT 2014