Merge branch 'master' of https://github.com/scottjehl/jquery into scottjehl-master