53687c6 Update to upstream 2.5.4 release

Authored and Committed by Jared K. Smith 7 years ago
    Update to upstream 2.5.4 release
    
        
file modified
+1 -0
file modified
+7 -2
file modified
+1 -1