Merge changes from plone/eestele.manager