svn path=/plone.app.discussion/trunk/; revision=46337
svn path=/plone.app.discussion/trunk/; revision=40532