version bumps, changelog update
Merge branch 'release/2.0.1' into dev