mercurial: minor update, add upstream patch