tweak date regexp
Merge branch 'master' into advanced