Ensure that the tmux server is started

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
Merge remote-tracking branch 'upstream/master'