Resolve merge conflicts between release-0.6.1 and release

Version CHANGELOG to 0.6.0

Version CHANGELOG to 0.5.4

Version CHANGELOG to 0.5.3

Merge remote-tracking branch 'origin/release-0.5.2' into release

Version CHANGELOG to 0.5.1

Version CHANGELOG to 0.5.0

Version CHANGELOG to 0.4.3

Version CHANGELOG to 0.4.2

Version for 0.4.1 release