By: Michael Lynch <git@mtlynch.io>
Merge origin/master into slice-1 Merge local origin/master at 0da6655 into slice-1 and resolve the typed media path API conflicts.