fix a bug of os.date
Merge branch 'master' into cheetah