Merge branch 'development'
Updated changelog.