1b8b16f Merge branch 'master' into f21

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