4da3e6c Update to upstream 1.6.0

Authored and Committed by error 8 years ago
    Update to upstream 1.6.0
    
        
file modified
+5 -2