Merge from r29239 from evilbungle-safe-html branch. svn path=/plone.app.discussion/trunk/; revision=29248