Merge branch 'bw/autoconf'