Fix Plone 4 compat
Merge branch 'master' into datakurre-negotiatorchange