79616b7 Update to upstream 1.6 release

Authored and Committed by Jared K. Smith 6 years ago
    Update to upstream 1.6 release
    
        
file modified
+14 -11
file modified
+81 -81