fix date formatter to handle non-date-strings
Merge branch 'master' into camera