Avoid exceptions from multiple brace matcher registrations.
Merge remote-tracking branch 'upstream/master'
Add tests for the commenter.