Merge branch 'mh/pthreads-autoconf' into maint