6c55e0b Merge branch 'master' into f26

Merged and Committed by bpereto 6 years ago
    Merge branch 'master' into f26
    
        
file modified
+14 -8
file modified
+1 -1