Merge from 65:8fcc1507a3f2

Retrofitting code to allow merging

(0) -30 -10 -2 +2 +10 +30 +100 tip

mercurial