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