+ no-op: merged r1178:1179 from 'delwin' branch into delwin-merge (for re-integration into delwin branch)
Authored by: mukau 2019-11-05
Parent: [r1306]
Child: [r1308]