8110d6c Merge branch 'master' into f23

Merged and Committed by spot 8 years ago
    Merge branch 'master' into f23
    
        
file modified
+12 -0