2b17147 sync with latest upstream

Authored and Committed by lucilanga 8 years ago
    sync with latest upstream
    
        
file modified
+1 -0
file modified
+11 -12
file modified
+1 -1