ab3fbc1f

By: Michael Lynch <git@mtlynch.io>

Merge remote-tracking branch 'origin/master' into media-svc/1/collapse-uploads-api