Merge branch 'master' into linkintegrity
Merge branch 'linkintegrity' of github.com:collective/collective.cover into linkintegrity