Merge branch 'htmlfixes'