Updated for Plone-4.2.5