a040ba9 Update to upstream version 2.16

Authored and Committed by mizdebsk 10 years ago
    Update to upstream version 2.16
    
        
file modified
+1 -0
file modified
+30 -15
file modified
+1 -1