Thanks Tilman Koschnick for the report and patch. Backport of 386d89ab55e620440d30590a8a104fe6d5eef830 from master