Added by Kostas Papadimitriou over 9 years ago
Merge branch 'release-0.16' into debian-wheezy
Conflicts: version