Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc HACKING
Simple merge

diff --cc NEWS
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge