plone.app.collection 1.x has been merged into master.