Merge pull request #7709 from alalek:fix_java_tests
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 24 Nov 2016 16:15:56 +0000 (16:15 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 24 Nov 2016 16:15:56 +0000 (16:15 +0000)

Trivial merge