upload limit lowered to 20 megabytes; video.upload disabled and video.upload.method unspecified
Merge branch 'liquid/2.x' of git://github.com/ibidem/mjolnir-html into liquid/2.x