Updated changelog.
Merge branch 'refs/heads/development'