when importing, naively convert created_at/updated_at to timestamp as a measure of last resort
Merge branch 'fix/1872' into develop