Upgrade to zc.buildout 1.7
Merge remote-tracking branch 'collective/master'