Merge branch '6897' of http://github.com/SlexAxton/jquery into SlexAxton-6897