Merge pull request #3278 from diizzyy/patch-13