Merge pull request #1211 from Arantor/release-2.1

! This should force all outgoing email (currently at least!) to have a M...
HTML5 cleanup bit

Signed-off-by: ziycon <ziycon.eire@gmail.com>
Merge pull request #1213 from ziycon/readonly_attribute

HTML5 cleanup bit
The ' />' method of closing so-called 'void' tags is no longer required in HTML5, per #1215

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1216 from Oldiesmann/release-2.1

The ' />' method of closing so-called 'void' tags is no longer required ...
Merge pull request #1218 from Arantor/release-2.1

Minor fixes