Merge pull request #4836 from Angristan/patch-1