buildout support
Merge branch 'master' into bug_1600