Fix 19916. Smarter tokenizing of contrib.comment's templatetags arguments.
Merge pull request #850 from bmispelon/ticket-19916

Fix 19916. Smarter tokenizing of contrib.comment's templatetags arguments