Merge branch 'ah/autoconf-fixes'