Updated to support Plone 4.2 and 4.3.