bdc4db9 update to the latest upstream

Authored and Committed by Adam Tkac 8 years ago
    update to the latest upstream
    
        
file modified
+1 -0
file modified
+14 -33
file modified
+8 -5
file modified
+1 -1