Merge branch 'master' into autoconf2