fix converting the time to ISO format
Merge branch 'master' into develop