Force content type on doT generated html strings
Merge remote-tracking branch 'upstream/master'