history notes about v2.1
further notes and version bump
last changelog entry
Merge remote-tracking branch 'origin/master'