Compile with conduit 1.1. Probably doesn't work
Merge branch 'master' into ahi