svn path=/plone.app.discussion/trunk/; revision=36875
svn path=/plone.app.discussion/trunk/; revision=35274