+ merged -r1434:1435 from tags/ddc-2.2.2-rc2 into trunk (fix compile for g++-5.4.0 / ubuntu 16.04.6)
Authored by: mukau 2020-02-14
Parent: [r1435]
Child: [r1437]