Changelog and version bump
Merge branch 'release/1.6.0.2' into develop