Additional refactoring of jQuery
Merge branch 'refactorTags'