S&D fix
Merge branch 'master' of https://github.com/mamico/plone.protect