Added by Kostas Papadimitriou about 10 years ago
Merge branch 'master' into packaging
Conflicts: .gitignore