bd233e8 Rebase to latest upstream release

Authored and Committed by mskalick 6 years ago
    Rebase to latest upstream release
    
        
file modified
+1 -0
file modified
+19 -19
file modified
+8 -4
file modified
+1 -1