fix doc build
Merge branch 'master' into conic