Merge for issue #24915

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
Simple merge

diff --cc README
Simple merge

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge