Merge pull request #3258 from diizzyy/patch-9