c6bd9c3 Rebase to 17.2.0 (#1547298)

Authored and Committed by ngompa 6 years ago
    Rebase to 17.2.0 (#1547298)
    
        
file modified
+1 -0
file modified
+7 -8
file modified
+1 -1