Merge branch 'automake-am11-am12'