merge with upstream
upgrade jxr lib to BSD version