Merge branch 'master' into testsuite-work

* master:
  maintcheck: fix maintainer-check failures, both real and spurious

diff --cc ChangeLog
Simple merge

diff --cc Makefile.am
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc tests/amhello-binpkg.test
Simple merge