* fix for bug #7247. However maybe similar problems still exist
with quoted substrings. t.b.d.

git-svn-id: trunk@5730 -