7288816 Rebase to 18.6.0

Authored and Committed by ngompa 5 years ago
    Rebase to 18.6.0
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1