Merge "Fix Date.toString() behavior / tidy up comments"