Fixes #26
Update CHANGELOG for v1.6
Merge branch 'release-1.6' into develop