Closed 9at8 closed 1 month ago
Fixes #1474
Merge by hand since I did the fix first on the 8.2.x branch.
Fixes #1474