Merge branch 'master' into py3

Conflicts:
	buildout.cfg

.gitignore

@@ -0,0 +1,14 @@
+*.pyc
+*.so
+*.dll
+__pycache__
+src/*.egg-info
+
+.installed.cfg
+.tox
+bin
+build
+coverage
+develop-eggs
+parts
+dist

buildout.cfg

@@ -2,7 +2,7 @@
 develop = .
     ../zope.app.appsetup
     ../ZODB
-parts = test test_bbb interpreter
+parts = test test_bbb coverage-test coverage-report interpreter
 versions=versions
 
 [versions]
@@ -24,6 +24,19 @@ recipe = zc.recipe.testrunner
 defaults = ['--tests-pattern', '^f?tests$']
 eggs = zope.testbrowser [test,test_bbb]
 
+[coverage-test]
+recipe = zc.recipe.testrunner
+eggs = zope.testbrowser [test]
+defaults = ['--coverage', '${buildout:directory}/coverage']
+
+[coverage-report]
+recipe = zc.recipe.egg
+eggs =
+    z3c.coverage
+scripts = coveragereport
+arguments = ('${buildout:directory}/coverage',
+             '${buildout:directory}/coverage/report')
+
 [interpreter]
 recipe = zc.recipe.egg
 eggs = zope.testbrowser