Merge pull request #7496 from abratchik:java.wrapper.fix.3.1
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 16 Oct 2016 16:49:33 +0000 (16:49 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 16 Oct 2016 16:49:33 +0000 (16:49 +0000)

Trivial merge