New Upstream Snapshot - calendar

No successful merges for calendar