Bringing the branch into sync with the distribution tarball.