Attempts to fix issue #230 reported by @foutrelis
changelog
Using org.json from common.
Merge branch 'master' into swig
Merge branch 'swig' into remove-vuze