15267a3 Merge branch 'f27' into f26

Merged and Committed by mhlavink 6 years ago
    Merge branch 'f27' into f26
    
        
file modified
+14 -1