Fix on older plones
Merge branch 'master' of github.com:plone-security/hotfix-testing