de19aa4 Merge branch 'master' into f26

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