d99a399 rebase to 0.18 (bz #1818706)

Authored and Committed by mjg 4 years ago
    rebase to 0.18 (bz #1818706)
    
        
file modified
+1 -0
file modified
+6 -3
file modified
+1 -1