fix issue in configure with bare comments
Merge branch 'prerelease' into ditto