Merge branch 'ct/autoconf-htmldir'