Upgrade to buildout v2.1.1