Pull in 6.0

This merges the new stuff on the original fork, into the one we're using.