More explicit explanation about JSON in browser.
Fixed an infinite loop in the QL parser.
Merge remote-tracking branch 'upstream/minor_issues' into test751

Conflicts:
	html/output_formats.html