Conduit merged to trunk

see mirage/mirage#287