8466534 Merge branch 'master' into f25

Merged and Committed by vondruch 7 years ago
    Merge branch 'master' into f25
    
        
file modified
+2 -0
file removed
-20
file modified
+2 -2