fixes #1661
fixes #1653
Merge branch 'master' of https://github.com/r888888888/danbooru