Merge tag '2.0.1' into develop

2.0.1

* tag '2.0.1':
  Update CHANGELOG, 2.0.1
  Bump version