Try to prevent x>=0 assert from firing
Merge branch 'master' of https://github.com/gnachman/iTerm2
Always use CGFontGetGlyphAdvances to estimate font size