Merge branch 'master' into...

Merge branch 'master' into '86-in-evaluate-py-there-is-no-way-of-using-both-4-and-5-column-score-files'

# Conflicts:
#   bob/bio/base/script/evaluate.py
12 jobs for 86-in-evaluate-py-there-is-no-way-of-using-both-4-and-5-column-score-files in 17 minutes and 7 seconds (queued for 5 seconds)