Merge branch 'i18n-improvements' of https://github.com/glueckpress/simone into gluckpress-i18n-improvements
Merge branch 'master' of https://github.com/mor10/simone