Update CHANGELOG, bump version to 0.6.2
merge