Merge upstream
Merge branch 'tree_paths' of https://github.com/andosa/scikit-learn into tree_paths