Merge "Fix spelling in nan date formats"