Merge branch 'htmlesc'