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