242e307c

By: Michael Lynch <git@mtlynch.io>

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

# Conflicts:
#	cmd/app/main.go
#	uploads/processor.go