cd29a0 rebase to latest upstream git snapshot

Authored and Committed by lnykryn 8 years ago
    rebase to latest upstream git snapshot
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1