Merged in a bunch of patches that I got as reaction to the 3.99 release.
See the ChangeLog for details
21 files changed