8e1fc582

By: Michael Lynch <git@mtlynch.io>

Merge remote-tracking branch 'origin/master' into slice-2.25

# Conflicts:
#	handlers/upload_test.go