Merge "Fix up a bogus changelog date"