c375b61 Use the upstream fix

Authored and Committed by jjelen 5 years ago
    Use the upstream fix
    
        
file modified
+29 -32