v2.1
Merge branch 'collections2' of https://github.com/Gankro/rfcs into collections2