fix function namespace
Merge branch 'dateformats' into merge