diff --git a/.appveyor.yml b/.appveyor.yml
index a00111a9..1d555594 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -97,6 +97,7 @@ build_script:
         $protodir = "c:\protobuf-release"
         $protoc = "c:\protobuf-release\bin\protoc.exe"
         $mysqldll = "c:\Program Files\MySQL\MySQL Server 5.7\lib\libmysql.dll"
+        cmake --version
         cmake .. -G "$env:cmake_generator" -T "$env:cmake_toolset" "-DCMAKE_PREFIX_PATH=c:/Qt/$env:qt_ver;$protodir;$zlibdir;$openssldir" "-DWITH_SERVER=1" "-DPROTOBUF_PROTOC_EXECUTABLE=$protoc" "-DMYSQLCLIENT_LIBRARIES=$mysqldll"
     - msbuild PACKAGE.vcxproj /p:Configuration=Release
     - ps: |
@@ -145,5 +146,6 @@ deploy:
       APPVEYOR_REPO_TAG_NAME: /([0-9]|[1-9][0-9])(\.([0-9]|[1-9][0-9])){2}$/    # regex to match semver naming convention for stable full releases
 
 
-# official validator for ".appveyor.yml" config file: https://ci.appveyor.com/tools/validate-yaml
-# appveyor config documentation: https://www.appveyor.com/docs/build-configuration/
+# Announcements of build image updates: https://www.appveyor.com/updates/
+# Official validator for ".appveyor.yml" config file: https://ci.appveyor.com/tools/validate-yaml
+# AppVeyor config documentation: https://www.appveyor.com/docs/build-configuration/
diff --git a/.ci/travis-compile.sh b/.ci/travis-compile.sh
index 5e98e7f5..8dbde5c2 100644
--- a/.ci/travis-compile.sh
+++ b/.ci/travis-compile.sh
@@ -16,6 +16,8 @@ if [[ $TRAVIS_OS_NAME == "linux" ]]; then
   prefix="-DCMAKE_PREFIX_PATH=$(echo /opt/qt5*/lib/cmake/)"
 fi
 
+cmake --version
+
 if [[ $BUILDTYPE == "Debug" ]]; then
   cmake .. -DWITH_SERVER=1 -DCMAKE_BUILD_TYPE=$BUILDTYPE $prefix -DTEST=1
   make -j2
@@ -27,6 +29,7 @@ if [[ $BUILDTYPE == "Debug" ]]; then
 
   if [[ $TRAVIS_OS_NAME == "linux" ]]; then
     cd ..
+    clang-format -version
     clang-format -i \
       common/*.h \
       common/*.cpp \
diff --git a/.ci/travis-dependencies.sh b/.ci/travis-dependencies.sh
index 40df1595..002ca50a 100644
--- a/.ci/travis-dependencies.sh
+++ b/.ci/travis-dependencies.sh
@@ -2,7 +2,7 @@
 
 if [[ $TRAVIS_OS_NAME == "osx" ]] ; then
   brew update
-  brew install ccache clang-format protobuf qt
+  brew install ccache protobuf qt
 fi
 if [[ $TRAVIS_OS_NAME == "linux" ]] ; then
   echo Skipping... packages are installed with the Travis apt addon for sudo disabled container builds
diff --git a/.travis.yml b/.travis.yml
index 04f93697..6378ecc2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,42 +1,38 @@
 language: cpp
-
+compiler: gcc
 cache: ccache
 
-conditions: v1
-
-
 matrix:
-  fast_finish: true
   include:
-  - os: linux
+  #Ubuntu
+  - name: Ubuntu (Debug)
+    if: tag IS NOT present
+    os: linux
     dist: xenial
     group: stable
     env: BUILDTYPE=Debug
-    if: tag IS NOT present
-  - os: linux
+  - name: Ubuntu (Release)
+    if: (branch = master AND NOT type = pull_request) OR tag IS present
+    os: linux
     dist: xenial
     group: stable
     env: BUILDTYPE=Release
-    if: (branch = master AND NOT type = pull_request) OR tag IS present
-  - os: osx
+  #macOS
+  - name: macOS (Debug)
+    if: tag IS NOT present
+    os: osx
     osx_image: xcode8
     env: BUILDTYPE=Debug
-    if: tag IS NOT present
-  - os: osx
+  - name: macOS (Release)
+    if: (branch = master AND NOT type = pull_request) OR tag IS present
+    os: osx
     osx_image: xcode8
     env: BUILDTYPE=Release
-    if: (branch = master AND NOT type = pull_request) OR tag IS present
 
 #install dependencies for container-based "linux" builds
 addons:
   apt:
-    sources:
-    - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main'
-      key_url: 'http://llvm.org/apt/llvm-snapshot.gpg.key'
     packages:
-    - bc
-    - clang-format-5.0
-    - cmake
     - libprotobuf-dev
     - protobuf-compiler
     - qt5-default
@@ -48,6 +44,7 @@ addons:
     - libqt5sql5-mysql
     - libqt5websockets5-dev
 
+
 before_install: bash ./.ci/travis-dependencies.sh
 
 script: bash ./.ci/travis-compile.sh
@@ -89,6 +86,7 @@ deploy:
 
 
 notifications:
+  email: false
   webhooks:
     urls:
     - https://webhooks.gitter.im/e/d94969c3b01b22cbdcb7
@@ -99,5 +97,7 @@ notifications:
     on_error: change
 
 
-# official validator for ".travis.yml" config file: https://yaml.travis-ci.org
-# travis config documentation: https://docs.travis-ci.com/user/customizing-the-build
+# Announcements of build image updates: https://docs.travis-ci.com/user/build-environment-updates/
+# For precise versions of preinstalled tools on the VM, check “Build system information” in the build log!
+# Official validator for ".travis.yml" config file: https://yaml.travis-ci.org
+# Travis CI config documentation: https://docs.travis-ci.com/user/customizing-the-build