Prevents js errors if output contains quotation mark
Merge remote-tracking branch 'gargoyle/master'
Merge remote-tracking branch 'obsy/master'