Upstream merge of next

Some conflicts may not have been handled correctly here, so please be careful when reviewing. I've done some light testing on this merge and all seems to be fine so far.

Test build: srb2kart-next.exe

Edited by wolfs

Merge request reports

Loading