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