Fixes for zsh/tmux interwork
Merge remote-tracking branch 'origin/master'
Additional comment