Merge branch 'wip/lantw/freebsd-meson-builds' into 'master'