Merge branch 'bug_7397' of https://github.com/rwldrn/jquery into rwldrn-bug_7397