Merged branch for ticket #397 into trunk
Authored by: numere 2019-08-19
Parent: [r611]
Child: [r613]