unused variables are redefined later
Merge branch 'master' of https://github.com/scikit-learn/scikit-learn