svn path=/plone.app.discussion/trunk/; revision=40892
svn path=/plone.app.discussion/trunk/; revision=39143