7c6384f Sync with f26

Authored and Committed by jvanek 6 years ago
    Sync with f26
    
        
file modified
+418 -386