Merge pull request #3606 from diizzyy/patch-25