Merge remote branch 't-nelson/automake'