Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	.travis.yml

.travis.yml

@@ -1,3 +1,5 @@
+dist: trusty
+
 matrix:
   include:
     # works on Precise and Trusty
@@ -14,6 +16,7 @@ before_install:
  - sudo apt-get update -qq
  - sudo apt-get install qt59base qt59websockets 
  - source /opt/qt59/bin/qt59-env.sh
+ - chmod +x res/libsodium/buildlibsodium.sh
 
 script:
  - qmake -v
@@ -30,4 +33,3 @@ script:
  - lrelease silentragon.pro
  - res/libsodium/buildlibsodium.sh
  - make CC=gcc-8 CXX=g++-8 -j2
-