990a73c29a
Fixes #9519. Partially using the patch there, but most of this is my own work.
3.9 KiB
3.9 KiB