Merge "Add a unit test for a DateUtils bug I already fixed."