Added by Kostas Papadimitriou about 8 years ago
Merge branch 'master' into develop
Conflicts: version