b2e699d sync with latest upstream

Authored and Committed by lucilanga 8 years ago
1 file changed. 49 lines added. 16 lines removed.
    sync with latest upstream
    
        
file modified
+49 -16