Rebase latest upstream

Because search needs the suggest functionality, that's not available in the version we are currently using.

Rubberband tests pass, not sure how to run Tire's own tests though.