Added by Christos Stavrakakis about 11 years ago
Merge branch 'master' into develop
Conflicts: devflow/utils.py