Release 2.1.0

Closes #2465.