review: merged r1263:1286 from 'delwin' branch into delwin-merge (resolved some TermExpander.cpp conflicts)
Authored by: mukau 2019-11-04
Parent: [r1303]
Child: [r1305]