2f74b36 Merge branch 'master' into f21

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