HTML support in localizations where possible
Merge branch 'v2.7'

* v2.7:
  HTML support in localizations where possible