modify extention of ChangeLog
Merge branch 'master' into develop