handle invalid date formats
Merge branch 'mathieubrun-master'