Fix class name
Bump cache version [ci skip]
Merge remote-tracking branch 'origin/master' into uber-cache

Conflicts:
	app/views/category/show.html.erb