Merge remote-tracking branch 'upstream/master' into separate_endpoint_assingn_finalize

Conflicts:
	deuce/tests/test_files.py