Update cider from upstream