Merge in all updates for autoconf