Merge branch 'ew/autoconf-pthread' into maint