Added by Nikos Skalkotos over 10 years ago
Merge branch 'develop' into hotfix-0.9.3
Conflicts: version