Merge p.a.collection (2.0b5) into p.a.contenttypes. p.a.collection is no longer a dependency.