Merge branch 'maint' into python-work

* maint:
  fix typo in recent ChangeLog entry
  docs, tests: synchronize examples on silent-rules from config.site
  tests: fix weakness in 'tests-environment-backcompat.test'
  tests: portability fixes in tests on amhello examples
  remake: add test ensuring that slower remakes don't hang
  remake: fix outdated comment in configure.am
  docs, tests: synchronize examples from docs to tests
  cosmetics: fix typos in recent ChangeLog entries

diff --cc ChangeLog
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge