Merge branch 'master' into dev

Author: FabianTerhorst

.travis.yml

@@ -5,7 +5,7 @@ filter_secrets: false
 sudo: false
 language: cpp
 env:
-  - GITHUB_DEPLOY_PRERELEASE=$(if echo $VERSION | grep -q "\-" ; then true; else false; fi)
+  - GITHUB_DEPLOY_PRERELEASE=$(if echo $VERSION | grep -q "\-" ; then echo true; else echo false; fi)
 #branches:
 #  only:
 #    - master
@@ -25,6 +25,7 @@ matrix:
   - filter_secrets: false
 before_script: cd runtime
 script:
+- echo "$GITHUB_DEPLOY_PRERELEASE"
 - mkdir build && cd build
 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then if ! [ -x "$(command /usr/bin/g++-8 -v)" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;sudo apt-get update;sudo apt-get -y install gcc-8 g++-8 ; fi ; fi
 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then CXX=/usr/bin/g++-8 ; fi