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