Merge pull request #6734 from felagund/patch-1