Added by Kostas Papadimitriou over 10 years ago
Merge branch 'master' into develop
Conflicts: version