Merge remote-tracking branch 'upstream/master'
Escape HTML characters when emitting documentation.

The arguments for Template() included <template> which was not being escaped.
Since it was not being escaped, web browsers stopped rendering the
documentation at <template>.