This is put in a new "conan" branch. Changes to the conan build process will only occur on this branch.