Merge pull request #3361 from diizzyy/patch-20