Merge pull request #8346 from Sahloul:fixes/python_wrapper/flann
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 10 Mar 2017 20:01:54 +0000 (20:01 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 10 Mar 2017 20:01:54 +0000 (20:01 +0000)

Trivial merge