Merge branch 'bw/autoconf' into next