Merged branch "newfileheaders" into trunk for Ticket #354
Authored by: numere 2019-09-19
Parent: [r632]
Child: [r634]