Merge Aurélien works on datetimeparser refactor on master