Bugfix for 092e816ee2: Move initialization of ColorMapper to *really* shared location
Merge remote-tracking branch 'origin/markercolors-by-value'