Added by Kostas Papadimitriou about 12 years ago
Merge branch 'master' into packaging
Conflicts: runtime.properties