Merge branch 'jquery' into master