Merge branch 'master' into 'dev'

# Conflicts:
#   .gitlab-ci.yml
#   .pylintrc
#   src/bluecat_bam/api.py
7 jobs for dev in 1 minute and 3 seconds (queued for 2 seconds)