review: merged 1232:1240 from 'delwin' branch into delwin-merge (resolved ConcordOptions.cpp conflicts)
Authored by: mukau 2019-11-01
Parent: [r1298]
Child: [r1300]