Merge branch 'release-0.2.4' into develop
Merge branch 'hotfix-axxim-factoids-0.4.2' into develop
"fix" merge conflict (wth?)
Merge branch 'develop' - Git Flow is getting annoying