Bump to conduit-1.0
Merge from master