Fixes #187, and another issue that was blocking videos uploading in the media library.