Develop

This has your v6 already merged into it so it should (hopefully) be painless to merge.