Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc tests/Makefile.am
index 9ee15778d618f9eb6dc68507ff5f2bcd4988dcb4,dab04e39336af6e94f6758b401366ee90e341e4b..b26796149d637098a429f90e607f99a5968ccf79
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -714,10 -632,8 +714,9 @@@ silent.test 
  silent2.test \
  silent3.test \
  silent4.test \
- silent5.test \
  silent6.test \
  silent7.test \
 +silent8.test \
  silent9.test \
  silentcxx.test \
  silentf77.test \

diff --cc tests/Makefile.in
index 0990f2f8180e8c2e8423b166ca2c32f4f1470459,de21f4334e83da8adf72837774285defe8cbafe1..ce9634a343b02278ec3a5960e311960e507ac594
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -976,10 -899,8 +976,9 @@@ silent.test 
  silent2.test \
  silent3.test \
  silent4.test \
- silent5.test \
  silent6.test \
  silent7.test \
 +silent8.test \
  silent9.test \
  silentcxx.test \
  silentf77.test \