Merge branch 'master' into bugfix/fix_ci_connection

# Conflicts:
#	.gitlab-ci.yml
#	HISTORY.rst
#	py_tools_ds/version.py
2 jobs for bugfix/fix_ci_connection in 21 seconds (queued for 1 second)