Merge pull request #3291 from dago/issue3220