Update from upstream Automake