[HTML] fixes #3029: <motto> contains blocks.
Merge remote-tracking branch 'upstream/master'

merge upstream with my own fork