Proposed fix for issue #454, pat-markspeciallinks
Merge pull request #455 from plone/issue-454

Proposed fix for issue #454, pat-markspeciallinks