Fixed encoding issues with [media]-BBCodes
Merge branch '2.0'