Let's make it official...
Merge branch 'search'
Yeah, let's do this...