Merge pull request #5980 from diizzyy/patch-6