Merging in changes from html4j repo