Merge branch 'master' into 'setup-for-ci'

# Conflicts:
#   .gitlab-ci.yml
#   docs/source/conf.py
#   notebooks/demo/tutorial_intake-1-introduction.ipynb