Merge "Fixed a bug where the media template wasn't transforming right" into nyc-dev