Merge branch 'master' into develop
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 29 Sep 2019 05:30:07 +0000 (07:30 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 29 Sep 2019 05:30:07 +0000 (07:30 +0200)

Trivial merge