Update with upstream

This is the last version that is compatible with the jQuery we use.