update chlog.

M
Merge branch 'maint-2.1.0'