b7ecd31 update to latest upstream

Authored and Committed by chkr 6 years ago
    update to latest upstream
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1