Merge pull request #13270 from 1over:flann_dist_fix
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 25 Nov 2018 18:27:42 +0000 (18:27 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 25 Nov 2018 18:27:42 +0000 (18:27 +0000)

Trivial merge