4752d7a6

By: Michael Lynch <git@mtlynch.io>

Merge master into image-not-photo

Bring master into the image-not-photo branch, including video upload support, while keeping this branch's image-oriented internal naming.

Use photo in user-facing upload labels and error messages.