trunk to simulide_0.3.12-SR3 (hopefully)
Authored by: arcachofo 2019-10-05
Parent: [r501]
Child: [r503]