3c3cafd Merge branch 'master' into f24

Merged and Committed by zbyszek 7 years ago
    Merge branch 'master' into f24
    
        
file modified
+2 -0
file removed
-502
file modified
+14 -20
file modified
+1 -1