Merge branch 'issue-720'
CHANGELOG