Merge branch 'master' into issue_459
Some fixes in the test
Merge branch 'issue_459' of github.com:collective/collective.cover into issue_459