13a5db6 Update with a number of upstream patches.

Authored and Committed by kevin a month ago
    Update with a number of upstream patches.
    
    Signed-off-by: Kevin Fenzi <kevin@scrye.com>
    
        
file added
+43
file added
+52
file added
+38
file modified
+25 -1