67ac402 merge with master

Merged and Committed by jkaluza 9 years ago
    merge with master
    
        
file modified
+6 -1