Added by Nikos Skalkotos almost 9 years ago
Merge master into develop
Conflicts: docs/conf.py image_creator/version.py version