Patch 8

Adds support for new Media Uploader and resolves #612.