Merge branch 'autotools'