Fix logic which was omitting some map line segments [1743]
Merge remote-tracking branch 'upstream/master'
Use new swatch code in preferences. [1765]

This adds the new “persistable” color swatch code to the “Display
Window” preferences.