Merge branch 'master' into bye-bye-localization

Conflicts:
	html5lib/treewalkers/_base.py