101dff7 Update to upstream 1.0.4 release

Merged and Committed by Jared K. Smith 6 years ago
    Update to upstream 1.0.4 release
    
        
file modified
+2 -0
file modified
+51 -5
file modified
+8 -4
file modified
+2 -2