Fixing patch versions. Removing unneeded country table rename.
manual update
Fixing patch versions.
Fixing version number.
Merge pull request #1252 from nZEDb/next-master

Fix for new installs
Another manuall update
Merge pull request #1253 from nZEDb/next-master

Tmux issue should be fixed now
Merge remote-tracking branch 'upstream/master'