diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa11e075cc0fd8c54733fead8bc84daabc081f0b..6489c109f75951127ce5701f50389680dea3b440 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,24 +143,6 @@ deploy_linux_27:
     - conda-linux
 
 
-# Linux + Python 3.4: Builds and tests
-build_linux_34:
-  <<: *build_job
-  variables: &linux_34_build_variables
-    PYTHON_VERSION: "3.4"
-    WHEEL_TAG: "py3"
-  tags:
-    - conda-linux
-
-test_linux_34:
-  <<: *test_job
-  variables: *linux_34_build_variables
-  dependencies:
-    - build_linux_34
-  tags:
-    - conda-linux
-
-
 # Linux + Python 3.5: Builds, tests and uploads wheel
 build_linux_35:
   <<: *build_job
@@ -195,6 +177,24 @@ docs_linux_35:
     - conda-linux
 
 
+# Linux + Python 3.6: Builds and tests
+build_linux_36:
+  <<: *build_job
+  variables: &linux_36_build_variables
+    PYTHON_VERSION: "3.6"
+    WHEEL_TAG: "py3"
+  tags:
+    - conda-linux
+
+test_linux_36:
+  <<: *test_job
+  variables: *linux_36_build_variables
+  dependencies:
+    - build_linux_36
+  tags:
+    - conda-linux
+
+
 # Mac OSX + Python 2.7: Builds and tests
 build_macosx_27:
   <<: *build_job
@@ -213,37 +213,37 @@ test_macosx_27:
     - conda-macosx
 
 
-# Mac OSX + Python 3.4: Builds and tests
-build_macosx_34:
+# Mac OSX + Python 3.5: Builds and tests
+build_macosx_35:
   <<: *build_job
-  variables: &macosx_34_build_variables
-    PYTHON_VERSION: "3.4"
+  variables: &macosx_35_build_variables
+    PYTHON_VERSION: "3.5"
     WHEEL_TAG: "py3"
   tags:
     - conda-macosx
 
-test_macosx_34:
+test_macosx_35:
   <<: *test_job
-  variables: *macosx_34_build_variables
+  variables: *macosx_35_build_variables
   dependencies:
-    - build_macosx_34
+    - build_macosx_35
   tags:
     - conda-macosx
 
 
-# Mac OSX + Python 3.5: Builds and tests
-build_macosx_35:
+# Mac OSX + Python 3.6: Builds and tests
+build_macosx_36:
   <<: *build_job
-  variables: &macosx_35_build_variables
-    PYTHON_VERSION: "3.5"
+  variables: &macosx_36_build_variables
+    PYTHON_VERSION: "3.6"
     WHEEL_TAG: "py3"
   tags:
     - conda-macosx
 
-test_macosx_35:
+test_macosx_36:
   <<: *test_job
-  variables: *macosx_35_build_variables
+  variables: *macosx_36_build_variables
   dependencies:
-    - build_macosx_35
+    - build_macosx_36
   tags:
     - conda-macosx
diff --git a/README.rst b/README.rst
index fb15a11e4f6ac267644a3ebf23650b4bc4337c48..f446d685f7e4423eead6ee79414f6ccbf6032ae5 100644
--- a/README.rst
+++ b/README.rst
@@ -7,6 +7,8 @@
    :target: https://www.idiap.ch/software/bob/docs/latest/bioidiap/bob.bio.base/master/index.html
 .. image:: https://gitlab.idiap.ch/bob/bob.bio.base/badges/master/build.svg
    :target: https://gitlab.idiap.ch/bob/bob.bio.base/commits/master
+.. image:: https://gitlab.idiap.ch/bob/bob.bio.base/badges/master/coverage.svg
+   :target: https://gitlab.idiap.ch/bob/bob.bio.base/commits/master
 .. image:: https://img.shields.io/badge/gitlab-project-0000c0.svg
    :target: https://gitlab.idiap.ch/bob/bob.bio.base
 .. image:: http://img.shields.io/pypi/v/bob.bio.base.svg
@@ -29,11 +31,10 @@ The `User Guide`_ provides installation and usage instructions.
 Installation
 ------------
 
-Follow our `installation`_ instructions. Then, using the Python interpreter
-provided by the distribution, bootstrap and buildout this package::
+Complete Bob's `installation`_ instructions. Then, to install this pacakge,
+run::
 
-  $ python bootstrap-buildout.py
-  $ ./bin/buildout
+  $ conda install bob.bio.base
 
 
 Contact
diff --git a/bob/bio/base/database/database.py b/bob/bio/base/database/database.py
index 47694c553f7ad2ac8f954c41ae924a5284a9066c..5bfb7978bacf2a0c9f4daf3b66065be9bd1bfd51 100644
--- a/bob/bio/base/database/database.py
+++ b/bob/bio/base/database/database.py
@@ -760,7 +760,7 @@ class ZTBioDatabase(BioDatabase):
     def client_id_from_t_model_id(self, t_model_id, group='dev'):
         """client_id_from_t_model_id(t_model_id, group = 'dev') -> client_id
         Returns the client id for the given T-Norm model id.
-        In this base class implementation, we just use the :py:meth:`client_id_from_model_id` function.
+        In this base class implementation, we just use the :py:meth:`BioDatabase.client_id_from_model_id` function.
         Overload this function if you need another behavior.
 
         **Parameters:**
diff --git a/doc/conf.py b/doc/conf.py
index 4bb13316082afd8d8ec9ec397bc27ff588a9677a..2cd2cce59beb278e0659063c79b53ef84b8149bf 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -229,7 +229,6 @@ autodoc_member_order = 'bysource'
 autodoc_default_flags = [
   'members',
   'undoc-members',
-  'inherited-members',
   'show-inheritance',
   ]