fb54deb0

By: Michael Lynch <git@mtlynch.io>

Merge remote-tracking branch 'origin/slice-1' into slice-2

# Conflicts:
#	handlers/upload_test.go