review-2: merged r1344 from 'delwin' branch into delwin-merge2 (resolved emacs style variable conflicts)
Authored by: mukau 2019-11-13
Parent: [r1362]
Child: [r1364]