Merge branch 'make_fix' of https://github.com/danheberden/jquery into danheberden...