Merge pull request #5979 from diizzyy/patch-5