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)