Add HTML render
Merge remote-tracking branch 'GitHub/HTMaiL/master' into Thomas
Merge branch 'Thomas'