Merge branch 'master' of https://github.com/highfidelity/hifi
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge branch 'master' of https://github.com/highfidelity/hifi
fix for ScriptEngine crash
Merge pull request #1835 from birarda/master

fix for toyball crash
Merge branch 'master' of https://github.com/worklist/hifi into scripting