oops, forgot to update version rc0
Merge branch 'merge'
going into rc0!!