https://github.com/imeji-community/imeji/issues/558
https://github.com/imeji-community/imeji/issues/529
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop