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