update change log
Merge branch 'master' into github