Merge from Moritz branch. Clean-up is still needed.

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

mercurial