Update ms2
Fix (hopefully) the git check
Update ms2 for git fix
Add JNI method for user data in call
and proxy config
Merge remote-tracking branch 'origin'