Release 4.0.0

Attempt again to pull in Gary's changes