Merge pull request #3729 from diizzyy/patch-1