Merge branch 'bug6242' of https://github.com/csnover/jquery into csnover-bug6242