Template locator bug fix + TinyMCE comment plugins