496b9ec Merge branch 'master' into f23

Merged and Committed by stransky 7 years ago
    Merge branch 'master' into f23
    
        
file modified
+47 -12