Autoconf changes
Merge from remote origin