Merge upstream/master into use_useresid.