Update ChangeLog.txt
merge changelog from release-0.8.5