Merge branch 'jc/epochtime-wo-tz'