Merge branch 'jn/no-g-plus-s-on-bsd' into maint