Merge scikit-learn (0.18-5) import into refs/heads/workingbranch
authorAndreas Tille <tille@debian.org>
Wed, 28 Dec 2016 12:24:45 +0000 (12:24 +0000)
committerAndreas Tille <tille@debian.org>
Wed, 28 Dec 2016 12:24:45 +0000 (12:24 +0000)

Trivial merge