Merge branch 'sl/autoconf'