4c983d Merge upstream changes for 8.7p1-29.6

Authored and Committed by rcolebaugh a year ago
    Merge upstream changes for 8.7p1-29.6
    
        
file modified
+78 -78
file modified
+4 -1