Upgrade machinery for Plone
