Merge branch 'master' into 'db-all-samples'

# Conflicts:
#   bob/bio/base/script/annotate.py
2 jobs for db-all-samples in 12 minutes and 37 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #219076
docker
build_linux_37

00:07:18

83.0%
passed #219075
macosx
build_macosx_37

00:12:37

83.0%