Merge branch 'master' into pr-msvc-support

diff --cc ChangeLog
Simple merge

diff --cc Makefile.am
index dbd3718f35569d011f79b9d442a5554193241aec,d2033c5ebb0cb045680971da47ecdec1afea8f82..2b5e6b615fdd2751784781564b70d560113e4a44
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -468,8 -468,8 +468,9 @@@ TESTSUITE_AT       = tests/testsuite.at 
                  tests/search-path.at \
                  tests/indirect_deps.at \
                  tests/archive-in-archive.at \
 +                tests/exeext.at \
                  tests/execute-mode.at \
+                 tests/bindir.at \
                  tests/cwrapper.at \
                  tests/infer-tag.at \
                  tests/localization.at \

diff --cc NEWS
Simple merge

diff --cc doc/libtool.texi
Simple merge

diff --cc libltdl/config/ltmain.m4sh
Simple merge

diff --cc libltdl/m4/libtool.m4
Simple merge