merge from the autoconf2 branch to the main branch