Commit c33a038da507 - cloned from mercurial