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)