Merge pull request #8847 from Cartucho:java_highgui
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 17 Aug 2017 20:04:33 +0000 (20:04 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 17 Aug 2017 20:04:33 +0000 (20:04 +0000)

Trivial merge