Fix a bug introduced in the last commit
Merge branch 'jquery-noconflict-mode'