b55d4ef sync to latest code, this time for real

Authored and Committed by spot 6 years ago
    sync to latest code, this time for real
    
        
file modified
+16 -7