Properly workaround jtoxcore bug
Merge remote-tracking branch 'antox/master'