6618b5a fix merge for rebuild

Merged and Committed by pbrobinson 7 years ago
    fix merge for rebuild
    
        
file modified
+8 -2