Merge from default mhoward-lt

Don't use any shorthand options

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

mercurial