merge upstream html5lib 0.8.10