cf88a30 Backport 794 PR and escape macros

Authored and Committed by puiterwijk 6 years ago
    Backport 794 PR and escape macros
    
    Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
    
        
file added
+354
file modified
+12 -6