Merge branch 'master' into 'global-config'

# Conflicts:
#   bob/ip/tensorflow_extractor/DrGanMSU.py
4 jobs for global-config in 47 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Build
canceled #128783
docker
build_linux_27

00:00:34

canceled #128784
docker
build_linux_36

canceled #128785
macosx
build_macosx_27

00:00:39

canceled #128786
macosx
build_macosx_36