merged

main

into a stale dev branch I had.. so 11 months of development amounts to:

1735 files changed, 188621 insertions(+), 49921 deletions(-)

😛