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