Plone5 compatibility
merge from upstream