Merge pull request #3856 from diizzyy/patch-27