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)
Status Name Job ID Coverage
  Build
passed build_linux_36 #214872
docker

00:04:14

passed build_linux_37 #214873
docker

00:04:09

passed build_macosx_36 #214870
macosx

00:31:42

passed build_macosx_37 #214871
macosx

00:08:08