Merge branch 'master' into issue_169

Conflicts:
	src/collective/cover/tests/test_contenttree_tab_path.txt
Merge branch 'issue_169' of github.com:collective/collective.cover into issue_169

Conflicts:
	src/collective/cover/tests/test_contenttree_tab_path.txt