Merge branch 'jc/epochtime-wo-tz' into maint-2.3