Merge pull request #2915 from jplitza/fix-2076