Adding the Search resource.
Merge branch 'master' into gh_master