0a8e9905

By: Michael Lynch <git@mtlynch.io>

Add parsed media caption and filename types

Port e4dd835 onto master without the current branch's upload handler changes.