Fix requestAccessibilityPermissionMavericks which got corrupted accidentally
Fix merge conflicts
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Resolve conflict
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2