Release 2.1.0

Signed-off-by: Ken Barber <ken@bob.sh>
Merge branch 'release_210'

* release_210:
  Release 2.1.0