review: merged r1256:1260 from 'delwin' branch into delwin-merge (resolved more ConcordOptions.cpp and ddc_dump.cpp conflicts)
Authored by: mukau 2019-11-04
Parent: [r1301]
Child: [r1303]