Merge remote-tracking branch 'upstream/master' into origin/rails4

Conflicts:
	sunspot/lib/sunspot/search/abstract_search.rb
	sunspot_rails/lib/sunspot/rails/searchable.rb
	sunspot_rails/lib/sunspot/rails/tasks.rb