HtmLawed upgrade
Merge pull request #2014 from vanilla/hotfix/htmlawed-upgrade

HtmLawed upgrade