Merge branch 'autoconf2'