filecheck: accept MIME types that don't contain ';'
Merge branch 'ready/more-magic'
changelog, close bug
Merge remote-tracking branch 'origin/master'