The second patch fixes an issue with calendar events for which the user is neither required nor optional participant. Both the article buffer and the org entry will now show the proper attendance status (required/optional/non-participant).