Updated changelog.
Merge branch 'master' into development
Bump to 0.6.0