8c8ca98 Merge branch 'master' into f26

Merged and Committed by besser82 7 years ago
    Merge branch 'master' into f26
    
        
file modified
+13 -3