change timestamp logic so all data downloaded at one go has same timestamp
Merge remote-tracking branch 'origin/master'