Merge "Handle Swift JSON listings with unqualified timestamps"