Merge pull request #3042 from muink/patch-1