Sync'd branch integration/fx-team with upstream @ Mon Oct  6 15:50:43 PDT 2014