Updated gradle version
fixed crash on nil vendor ID
Merge branch 'master' into develop