no more parsing dates because is causing problems
Merge remote-tracking branch 'origin/master'