One of the last commits of this release.

Wrapping things up now.