merge the autotools branch