Fix assert when right-clicking on a line with a lot of double width characters (or, presumably, certain kinds of combining marks) because we computed their screen positions incorrectly.
Merge branch 'v2' of https://github.com/gnachman/iTerm2 into v2