fix timesync bug
Merge branch 'master'