Merge remote-tracking branch 'origin/update' into update

# Conflicts:
#	requirements.txt
#	setup.py