fixes #1825
potential fix for #1818
Merge branch 'master' into omnibooru

Conflicts:
	config/routes.rb