ChangeLog update to merge in 0.9