Fixed compatibility issues when jquery is included
Merge remote-tracking branch 'origin/master'