Merge pull request #6955 from atomic83/patch-1