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)
Status Name Job ID Coverage
  Build
passed build_linux_27 #82309
conda-linux

00:01:42

passed build_linux_35 #82310
conda-linux

00:01:39

passed build_linux_36 #82311
conda-linux

00:01:31

passed build_macosx_27 #82312
conda-macosx

00:02:56

passed build_macosx_35 #82313
conda-macosx

00:02:42

passed build_macosx_36 #82314
conda-macosx

00:02:42

 
  Test
passed test_linux_27 #82315
conda-linux

00:02:26

passed test_linux_35 #82316
conda-linux

00:02:24

passed test_linux_36 #82317
conda-linux

00:02:28

passed test_macosx_27 #82318
conda-macosx

00:05:27

passed test_macosx_35 #82319
conda-macosx

00:05:35

passed test_macosx_36 #82320
conda-macosx

00:05:35