Added by Stavros Sachtouris about 11 years ago
Merge branch 'hotfix-0.7.1' into develop
Conflicts: version