New Upstream Snapshot - canid

No successful merges for canid