updated ChangeLog
2.1.8
Merge branch 'master' into tags-master