f961dc0a

By: Michael Lynch <git@mtlynch.io>

Merge slice-2 into slice-3

Bring slice-2's upload processor fixes and animated GIF upload coverage into slice-3, while keeping slice-3's video upload coverage.