amueller Merge pull request scikit-learn#4965 from mrphilroth/4922