1.0.20: Fixing the html output for the json and csv views
Merge remote-tracking branch 'origin/master'