manually merge https://github.com/plone/Products.CMFPlone/pull/68