First drafts
Merge branch 'master' of https://github.com/plone/security-mockups