Added by Kostas Papadimitriou about 10 years ago
Merge branch 'release-0.15' into develop
Conflicts: version