Added by Nikos Skalkotos almost 10 years ago
Merge branch 'hotfix-0.4.1' into develop
Conflicts: image_creator/version.py version