Merge pull request #3954 from diizzyy/patch-31