Template locator bug fix + TinyMCE comment plugins
Merge remote-tracking branch 'upstream/master'
Merge pull request #492 from solispauwels/master

Template locator bug fix + TinyMCE comment plugins