Merge pull request #3745 from akoeplinger/fix-bug44937