54d28a4 Merge branch 'master' into f21

Merged and Committed by kwizart 9 years ago
    Merge branch 'master' into f21
    
        
file modified
+2 -0
file modified
+9 -7
file modified
+1 -1