This just merges upstream into whatever commit the submodule was on.