+ merged -r 1007:1008 from tag ddc-2.1.12-pre1 into trunk (ddcMMap<> fixes for empty source files)
Authored by: mukau 2018-06-13
Parent: [r1008]
Child: [r1010]