The great JQuery cleanup.
Merge origin/master