Merge pull request #1388 from schani/fix-23401