review: merged r1240:1250 from 'delwin' branch into delwin-merge (resolved more ConcordOptions.cpp conflicts)
Authored by: mukau 2019-11-01
Parent: [r1299]
Child: [r1301]