57aff16 Sync with latest upstream release

Authored and Committed by David Vossel 10 years ago
    Sync with latest upstream release
    
        
file modified
+1 -0
file removed
-26
file modified
+14 -13
file modified
+1 -1