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