Update changelog for release 3.6

Mathis Kelmrequested to merge
update/changelog-3.6 into master

Updates the changelog to include changes included in release 3.6

Merge request reports