7497714 Update to upstream 1.5 release

Authored and Committed by Jared K. Smith 8 years ago
    Update to upstream 1.5 release
    
        
file modified
+161 -90
file modified
+81 -72