jquery fix for global installs
Merge branch 'master' into 1.0