Merge pull request #7646 from joshgowans/patch-1