Merge branch 'master' into 'add-gpu-queue'

# Conflicts:
#   bob/pipelines/distributed/sge.py
4 jobs for add-gpu-queue in 31 minutes and 42 seconds (queued for 5 seconds)