Merge pull request #1062 from smoofra/tmux