b340710 Update to latest upstream version

Authored and Committed by ahs3 8 years ago
    Update to latest upstream version
    
        
file modified
+7 -0
file modified
+1 -1