Merge branch 'bug_6158' of https://github.com/jboesch/jquery into jboesch-bug_6158