Merge pull request #4147 from diizzyy/patch-35