51b1338 Merge branch 'master' into f20

Merged and Committed by hannes 9 years ago
    Merge branch 'master' into f20
    
    Update to 2.9.0
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+5 -76