Merge "Fix Date.toString."