Merge "Update upcoming events"