Merge pull request #3046 from nitroshift/patch-4