merge branch 'dev'
merge branch 'dev'
fixes a broken link to CHANGELOG from README