merge master
authorN. Engelhardt <nak@symbioticeda.com>
Wed, 8 Apr 2020 15:21:44 +0000 (17:21 +0200)
committerN. Engelhardt <nak@symbioticeda.com>
Wed, 8 Apr 2020 15:23:52 +0000 (17:23 +0200)

Trivial merge