Merge branch 'bw/no-python-autoconf'