Test changes from the meson MR
Hopefully these aren't too controversial, so we can get them merged sooner than the meson branch, and there are several pull requests that interact with this opened, so maybe merging sooner than meson would be useful.
Hopefully these aren't too controversial, so we can get them merged sooner than the meson branch, and there are several pull requests that interact with this opened, so maybe merging sooner than meson would be useful.