fix for: https://github.com/imeji-community/imeji/issues/464
Merge branch 'release-1.2.1.0' of https://github.com/imeji-community/imeji into release-1.2.1.0