Ready for 7.0
Trying again to push to github.