b5baa84 Merge branch 'master' into f18

Merged and Committed by madko 10 years ago
    Merge branch 'master' into f18
    
        
file modified
+2 -14
file modified
+26 -11
file modified
+1 -1