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

00:04:14

passed #214873
docker
build_linux_37

00:04:09

passed #214870
macosx
build_macosx_36

00:31:42

passed #214871
macosx
build_macosx_37

00:08:08