josn fix
gcc
need clang
Merge remote-tracking branch 'upstream/master'