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