Added by Christos Stavrakakis about 9 years ago
Merge branch 'hotfix-0.11.1' into debian-hotfix-0.11.1