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