Quick hack to fix zsh.
Pull up tmux fix from trunk.