Merge "Fix problem w/ sync of large calendars (never syncs)"