Fix merge conflict with scikit-learn/master

Turns out the conflict wasn't anything significant. Should unblock #2532.