updated with a dump of the search query
Merge origin/master