939b4ac merge of f23 with f24

Merged and Committed by sopotc 8 years ago
    merge of f23 with f24
    
        
file modified
+2 -0