090ecae Merge branch 'master' into f23

Merged and Committed by Igor Gnatenko 8 years ago
    Merge branch 'master' into f23
    
        
file modified
+7 -1