5cdfc28 Backport changes for astyle 3.1

Authored and Committed by jenslody 6 years ago
    Backport changes for astyle 3.1
    
        
file added
+367
file modified
+6 -1