Merge remote-tracking branch 'origin/master'

# Conflicts:
#	detect.py
This commit is contained in:
Glenn Jocher 2019-08-31 20:06:58 +02:00
commit eb24c46200

Diff Content Not Available