Merge remote-tracking branch 'spulec/master'

Conflicts:
	moto/s3/responses.py