Implement / fix all issues for GitHub Milestone 2.1. See the
CHANGELOG file under version 2.10 for details.