Merge pull request #11731 from totten/master-setver