Merge branch 'maint'

* maint:
  sync: update files from upstream with "make fetch"
  automake: don't define many identical 'lang_*_rewrite' subroutines
  coverage: bugs #8844 and #9933 (already fixed by Akim's work on ylwrap)

diff --cc automake.in
Simple merge

diff --cc t/list-of-tests.mk
Simple merge