Merge branch 'master' into gl

- moved the uncolorize action to the color toolbar, renamed to uncolor

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

mercurial