Restore 10.5 compatibility
Merge branch 'v2' of https://github.com/gnachman/iTerm2 into v2