Merge merkaartor (0.18.4+ds-5) import into refs/heads/workingbranch
authorJerome Benoit <calculus@rezozer.net>
Wed, 11 Nov 2020 20:53:53 +0000 (20:53 +0000)
committerJerome Benoit <calculus@rezozer.net>
Wed, 11 Nov 2020 20:53:53 +0000 (20:53 +0000)

Trivial merge