Fixes #335

The fix only includes the commits from Dec 10, 3780fd367796593d553cab039e0629825ddba56d
regarding report-html.js