Tidy up
Merge branch 'master' into oja-insert-html-ensure-p