e0d5a35 Merge branch 'f27' into f26

Merged and Committed by adelton 6 years ago
    Merge branch 'f27' into f26
    
        
file modified
+1 -0
file modified
+6 -3
file modified
+1 -1