Fix setting breakpoint at line zero
Merge remote-tracking branch 'upstream/jsd2' into jsd2