Merge pull request #8496 from Sahloul:fixes/wrappers/imgproc/EMD
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 3 Apr 2017 20:55:50 +0000 (20:55 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 3 Apr 2017 20:55:51 +0000 (20:55 +0000)

Trivial merge