diff --git a/.ci b/.ci
index 45dba6643..698e6b00e 160000
--- a/.ci
+++ b/.ci
@@ -1 +1 @@
-Subproject commit 45dba66437a313b034ac4f7dcd580cecb8d6d4c7
+Subproject commit 698e6b00e842709c56f5ec61e0c765218fa30016
diff --git a/.travis.yml b/.travis.yml
index e3f995d4a..443f39db3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,50 +23,50 @@ matrix:
 
 # Different configurations of default gcc and clang
 
-  - env: BASE_BRANCH=7.0
+  - env: BASE=7.0
 
-  - env: BASE_BRANCH=7.0
+  - env: BASE=7.0
     compiler: clang
 
-  - env: BASE_BRANCH=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
+  - env: BASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
 
-  - env: BASE_BRANCH=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
+  - env: BASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
     compiler: clang
 
 # Trusty: compiler versions very close to RHEL 7
 
-  - env: BASE_BRANCH=7.0
+  - env: BASE=7.0
     dist: trusty
 
-  - env: BASE_BRANCH=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
+  - env: BASE=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
+  - env: BASE=7.0 WINE=32 TEST=NO STATIC=YES
     compiler: mingw
 
-  - env: BASE_BRANCH=7.0 WINE=32 TEST=NO STATIC=NO
+  - env: BASE=7.0 WINE=32 TEST=NO STATIC=NO
     compiler: mingw
 
 # Cross-compilation to RTEMS
 
-  - env: BASE_BRANCH=7.0 RTEMS=4.10 TEST=NO
+  - env: BASE=7.0 RTEMS=4.10 TEST=NO
 
-  - env: BASE_BRANCH=7.0 RTEMS=4.9 TEST=NO
+  - env: BASE=7.0 RTEMS=4.9 TEST=NO
 
 # Other gcc versions (adding as an extra package)
 
-  - env: BASE_BRANCH=7.0
+  - env: BASE=7.0
     compiler: gcc-6
     addons: { apt: { packages: ["g++-6"], sources: ["ubuntu-toolchain-r-test"] } }
 
-  - env: BASE_BRANCH=7.0
+  - env: BASE=7.0
     compiler: gcc-7
     addons: { apt: { packages: ["g++-7"], sources: ["ubuntu-toolchain-r-test"] } }
 
 # MacOS build
 
-  - env: BASE_BRANCH=7.0
+  - env: BASE=7.0
     os: osx
     compiler: clang