15592fbe

By: Michael Lynch <git@mtlynch.io>

Merge remote-tracking branch 'origin/slice-3' into slice-3

# Conflicts:
#	handlers/upload.go