Merge pull request #4797 from totten/master-cs