Make cmd-0 not leave the session's bookmark in an inconsistent state (bug 2546)
Merge branch 'master' of https://github.com/gnachman/iTerm2