Sync ChangeLog with 0.6