Merge pull request #4813 from Shamanoid/patch-1