V4.0.0 rc

Final once-over before merging.