720b88a Merge branch 'master' into f20

Merged and Committed by Martin Stransky 9 years ago
    Merge branch 'master' into f20
    
        
file added
+12
file modified
+6 -1