Fixed date fields regular expression
Merge branch 'sapns__datetime_fields' into master2