9474674 merge from master

Merged and Committed by stevejenkins 9 years ago
    merge from master
    
        
file modified
+20 -12