Merge branch 'master' into 6.0

diff --cc .gitlab-ci.yml
Simple merge

diff --cc doc/conf.py
index f7952a95eba0589f056a689f7a67ed1178031ab4,a2aad176a6192d874122ccedac8719a0da1380d2..da04f0dc06693326e3939892a01cb8e031b6dad4
--- 1/doc/conf.py
--- 2/doc/conf.py
+++ b/doc/conf.py
@@@ -13,13 -13,12 +13,17 @@@ if os.environ.get('READTHEDOCS', None) 
      subprocess.call('doxygen')
  
  # Add any Sphinx extension module names here, as strings.
 -extensions = ['sphinx.ext.todo', 'sphinx.ext.viewcode', 'breathe']
 +extensions = [
 +    'sphinx.ext.todo',
 +    'sphinx.ext.viewcode',
 +    'sphinx_tabs.tabs',
 +    'breathe',
 +]
  
+ theme_major = sphinx_rtd_theme.__version__.partition('.')[0]
+ if theme_major == '2':
+     extensions.append('sphinxcontrib.jquery')
+ 
  # Breathe configuration
  breathe_projects = {"libkres": "doxyxml"}
  breathe_default_project = "libkres"