Fix typo in ImageBBCode
Merge branch '2.0'