(wip) merge branch iss24 to master

FIXME: The html tags of the json debug data is not parsed in the
browser.