tweak timeout handling in HTMLFeatures

Conflicts:

	release-notes.txt