Updating from the Mercurial 2.6 release.