conan is gone
Merge branch 'master' into vs2010