Merge defnax's branch

This commit is contained in:
hunbernd 2020-01-02 18:57:55 +01:00
commit dae10b06bb