Merge pull request #3242 from diizzyy/patch-5