merge upstream changes v3.0

(0) -30 -10 -1 +1 +10 tip

mercurial