update changelog [skip ci]
Merge branch 'master'