Update ChangeLog date
Merge branch 'dev'