Merge branch 'meson-config-h' into 'master'