Merge pull request #6567 from skramstad/master