Merge 2019.12 master into develop
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Mon, 23 Dec 2019 19:00:12 +0000 (20:00 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Mon, 23 Dec 2019 19:00:12 +0000 (20:00 +0100)

Trivial merge