Merge branch 'bw/autoconf-more'