fixes #1396, fix tests
Merge branch 'master' of github.com:r888888888/danbooru
t push
potential fix for #1310
Merge branch 'master' of github.com:r888888888/danbooru