Commit stuff that should have gone in last week when I made the pre-releases: