add mod_time back in
Merge commit '590a373'