Merge branch 'bug-3333' of https://github.com/rdworth/jquery