Merge branch 'dev' into 'master' refactor: Log message improved. See merge request quiqqer/quiqqer!21