Merge pull request #7805 from alalek:fix_java_test_2.4
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Wed, 7 Dec 2016 13:58:31 +0000 (13:58 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Wed, 7 Dec 2016 13:58:32 +0000 (13:58 +0000)

Trivial merge