Pull stuff in again #17

Merged
max merged 6 commits from master into unstable 2026-01-22 14:07:37 +11:00