Merge pull request #2746 from diizzyy/patch-5