resync with Plone 4.3.2