9707216 Merge branch 'master' into f20

Merged and Committed by Rolf Fokkens 10 years ago
    Merge branch 'master' into f20
    
        
file modified
+1 -0
file modified
+10 -10
file modified
+1 -2