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