fixes #942
Merge branch 'master' of github.com:r888888888/danbooru
fixes #1154
Merge branch 'master' of github.com:r888888888/danbooru