Merge pull request #3797 from diizzyy/patch-21