Merge branch 'maint'

diff --cc tests/Makefile.am
index 449a36c99f39b1b0c54a534fb48a9e81df56279a,c1600284c38b38504715f53f01a5e836d2abd5a2..3428b443c2dd768ee5a4d35892d0c57c6ae2f88e
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -301,8 -298,8 +303,9 @@@ exeext4.test 
  exsource.test \
  ext.test \
  ext2.test \
 +ext3.test \
  extra.test \
+ extra2.test \
  extra3.test \
  extra4.test \
  extra5.test \

diff --cc tests/Makefile.in
index 1d91851d4a65aeccd27bd5eb8571034a510383b4,29548038223229c187d60ec7ffec23555b57b73a..b84dd1dca7bdc49c2a5bf58f5dd49e9faf82e7b1
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -542,8 -532,8 +544,9 @@@ exeext4.test 
  exsource.test \
  ext.test \
  ext2.test \
 +ext3.test \
  extra.test \
+ extra2.test \
  extra3.test \
  extra4.test \
  extra5.test \