Merge "Fix bug #2331761 (Instances of a recurring event are missing)"