Merge pull request #4508 from diizzyy/patch-60