[#16] merged changes from erichspitzweg
Authored by: ingo <> 2019-12-31
Parent: [94fecf]
Child: [080df0]