Merge pull request #3328 from efuss/fix-3312