Fix fucked merge
Merge branch mac to master
Merge branch 'master' into linux
Tmux mouse mode on