updated ChangeLog
Merge branch 'master' into intro
updated ChangeLog
Merge branch 'master' into intro