2.1 release

Pull request for merging the current minor (2.1) into master to prepare the 2.1 release.