Re-factor StripHtml into ConvertHtmlCodes extension method
Merge branch 'v3-fixes' into v3