Merge branch 'master' into 'bob-extension-config-file'

# Conflicts:
#   bob/bio/base/tools/command_line.py
12 jobs for bob-extension-config-file in 11 minutes and 46 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Build
passed build_linux_27 #109296
conda-linux

00:03:07

passed build_linux_35 #109297
conda-linux

00:03:03

passed build_linux_36 #109298
conda-linux

00:03:09

passed build_macosx_27 #109299
conda-macosx

00:04:18

passed build_macosx_35 #109300
conda-macosx

00:04:13

passed build_macosx_36 #109301
conda-macosx

00:04:12

 
  Test
passed test_linux_27 #109302
conda-linux

00:04:43

89.0%
passed test_linux_35 #109303
conda-linux

00:04:52

89.0%
passed test_linux_36 #109304
conda-linux

00:05:29

89.0%
passed test_macosx_27 #109305
conda-macosx

00:07:19

90.0%
passed test_macosx_35 #109306
conda-macosx

00:07:11

90.0%
passed test_macosx_36 #109307
conda-macosx

00:07:13

90.0%