trunk to simulide_0.3.12-SR3 (2º try)
Authored by: arcachofo 2019-10-05
Parent: [r498]
Child: [r500]