Updated changelog.
Merge branch 'development'