Merge branch '2.1_release' into 'master'

2.1 release

- CHANGELOG updates for 2.1
- about.html updated

See merge request !55
1 job for 2.2-dev in 1 minute and 24 seconds (queued for 2 seconds)