- update change log
Merge branch 'master' into py3