Added by Christos Stavrakakis almost 11 years ago
Merge branch 'hotfix-0.11.6' into develop
Conflicts: version