14673c7 Bugfix (upstream #4555) + new features

Authored and Committed by sagitter 5 years ago
    Bugfix (upstream #4555) + new features
    
        
file added
+206
file added
+159
file modified
+12 -3