diff --git a/.ci b/.ci
index fb95b95f4..45dba6643 160000
--- a/.ci
+++ b/.ci
@@ -1 +1 @@
-Subproject commit fb95b95f4fa2e331d99099af8e2713c8565aa707
+Subproject commit 45dba66437a313b034ac4f7dcd580cecb8d6d4c7
diff --git a/.travis.yml b/.travis.yml
index b641bdbc0..e3f995d4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: cpp
 compiler: gcc
-dist: trusty
+dist: xenial
 
 addons:
   apt:
@@ -21,36 +21,52 @@ script:
 matrix:
   include:
 
-  - env: BRBASE=7.0
+# Different configurations of default gcc and clang
 
-  - env: BRBASE=7.0 CMPLR=clang
+  - env: BASE_BRANCH=7.0
+
+  - env: BASE_BRANCH=7.0
     compiler: clang
 
-  - env: BRBASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
+  - env: BASE_BRANCH=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
 
-  - env: BRBASE=7.0 CMPLR=clang EXTRA="CMD_CXXFLAGS=-std=c++11"
+  - env: BASE_BRANCH=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
     compiler: clang
 
-  - env: BRBASE=7.0 WINE=32 TEST=NO STATIC=YES
+# Trusty: compiler versions very close to RHEL 7
+
+  - env: BASE_BRANCH=7.0
+    dist: trusty
+
+  - env: BASE_BRANCH=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
+    dist: trusty
+
+# Cross-compilation to Windows using MinGW and WINE
+
+  - env: BASE_BRANCH=7.0 WINE=32 TEST=NO STATIC=YES
     compiler: mingw
 
-  - env: BRBASE=7.0 WINE=32 TEST=NO STATIC=NO
+  - env: BASE_BRANCH=7.0 WINE=32 TEST=NO STATIC=NO
     compiler: mingw
 
-  - env: BRBASE=7.0 RTEMS=4.10 TEST=NO
+# Cross-compilation to RTEMS
 
-  - env: BRBASE=7.0 RTEMS=4.9 TEST=NO
+  - env: BASE_BRANCH=7.0 RTEMS=4.10 TEST=NO
 
-  - env: BRBASE=7.0 CMPLR=gcc-6
-    dist: xenial
+  - env: BASE_BRANCH=7.0 RTEMS=4.9 TEST=NO
+
+# Other gcc versions (adding as an extra package)
+
+  - env: BASE_BRANCH=7.0
     compiler: gcc-6
     addons: { apt: { packages: ["g++-6"], sources: ["ubuntu-toolchain-r-test"] } }
 
-  - env: BRBASE=7.0 CMPLR=gcc-7
-    dist: xenial
+  - env: BASE_BRANCH=7.0
     compiler: gcc-7
     addons: { apt: { packages: ["g++-7"], sources: ["ubuntu-toolchain-r-test"] } }
 
-  - env: BRBASE=7.0
+# MacOS build
+
+  - env: BASE_BRANCH=7.0
     os: osx
     compiler: clang