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