Merge pull request #1931 from mstorchak/tmux