update time2 regex
Merge remote-tracking branch 'origin/master'