4a5bbd38

By: Michael Lynch <git@mtlynch.io>

Merge origin/master into slice-2.5

Resolve the media handler conflict by keeping adjacent media prefetching from origin/master while restoring the unified MediaFiles API.