Merge branch 'hotfix-axxim-factoids-0.4.2' into develop