95781c4 rebase to newer master

Authored and Committed by airlied 4 years ago
    rebase to newer master
    
        
file modified
+6 -6
file modified
+1 -1