If we accept an ISO8601 timestamp, we should generate an ISO8601 too.
Merge branch 'master' into devel

Conflicts:
	configure.ac
Cannot build locally under version 5
Bumped version