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)