We have our own p.a.upgrade branch.
Merge branch '5.0' of github.com:plone/buildout.coredev into 5.0