Merge remote-tracking branch 'alfh/bugfix_htmlclean' into next