Merge various branches to get ready for release

I think we are getting very close here.