Added by Iustin Pop almost 15 years ago
Merge commit 'origin/next' into branch-2.1
Conflicts: lib/cli.py: trivial extra empty line