Merge pull request #1793 from Zauberfisch/3.1

API: made more robust SSTemplateParser->includeDebuggingComments()