Merge pull request #3327 from rolfbjarne/bug41745