d142412 Merge branch 'master' into f23

Merged and Committed by stransky 7 years ago
    Merge branch 'master' into f23
    
        
file modified
+75 -20
file modified
+4 -1