GH 900 (backport from D2)
update changelog
Merge branch 'pr/906' into devel

Fixes Issue #906