Another manuall update
Merge pull request #1253 from nZEDb/next-master

Tmux issue should be fixed now