Merge branch 'master' into Website_Flare

Conflicts:
app/views/catalog/_search_form.html.erb