8648a672

By: Michael Lynch <git@mtlynch.io>

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

# Conflicts:
#	handlers/routes.go
#	handlers/templates/pages/upload.html