Changelog update.
Merge branch 'master' into version-0.3