Allen D Byrne - 4 days ago

Fix is on the bug-796-json-note-phase1-gtk3 Hg branch (same branch as SF #796), pushed to SF. Flipping to needs-review pending merge into Hg mainline, same as #796.