fixes #1982
Merge branch 'master' into omnibooru