Merge pull request #3329 from efuss/fix-3311