Throw an exception when starting a view block twice
Merge pull request #2201 from ravage84/start-viewblock-twice

Throw an exception when starting a view block twice
add mkv mime file type
Merge pull request #2213 from zoghal/2.x-fixme

add mkv mime file type