Merge branch 'maint' of ssh://git.sv.gnu.org/srv/git/automake into maint