Update with tree[f019b1] of official Mercurial repository.