Rails 3.2.21
Merge branch 'master' into add_search_controller