134a766 backport and rebase 1.0.1 patch

Authored and Committed by dridi 9 years ago
    backport and rebase 1.0.1 patch
    
        
file added
+140
file modified
+8 -1